HW-Isolation: Fix Additional Data Uri #1128
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
deepakala-k
force-pushed
the
fix_additional_uri
branch
from
a762c72 to
55a74ac
Compare
The guard records could be associated with hidden or visible PEL. The
additional URI for visible pel would be
/redfish/v1/Systems/system/LogServices/EventLog/Entries/<id>/attachment
and for the hidden ones it has be
/redfish/v1/Systems/system/LogServices/CELog/Entries/<id>/attachment
So before adding the AdditionalDataURI, check for the hidden property of
the PEL and add the URI accordingly.
Tested and found it works as expected
```
{
"@odata.id": "/redfish/v1/Systems/system/LogServices/HardwareIsolation/Entries",
"@odata.type": "#LogEntryCollection.LogEntryCollection",
"Description": "Collection of System Hardware Isolation Entries",
"Members": [
{
"@odata.id": "/redfish/v1/Systems/system/LogServices/HardwareIsolation/Entries/1",
"@odata.type": "#LogEntry.v1_9_0.LogEntry",
"AdditionalDataURI": "/redfish/v1/Systems/system/LogServices/CELog/Entries/824/attachment",
"Created": "2025-01-23T12:57:02+00:00",
"EntryType": "Event",
"Id": "1",
"Links": {
"OriginOfCondition": {
"@odata.id": "/redfish/v1/Systems/system/Processors/dcm0-cpu0/SubProcessors/core0"
}
},
"Message": "Spare Guard Record core0",
"MessageArgs": [
"Spare",
"core0"
],
"MessageId": "OpenBMC.0.6.GuardRecord",
"Name": "Hardware Isolation Entry",
"Severity": "OK"
},
{
"@odata.id": "/redfish/v1/Systems/system/LogServices/HardwareIsolation/Entries/3",
"@odata.type": "#LogEntry.v1_9_0.LogEntry",
"AdditionalDataURI": "/redfish/v1/Systems/system/LogServices/EventLog/Entries/830/attachment",
"Created": "2025-01-23T13:08:31+00:00",
"EntryType": "Event",
"Id": "3",
"Links": {
"OriginOfCondition": {
"@odata.id": "/redfish/v1/Systems/system/Processors/dcm0-cpu1/SubProcessors/core0"
}
},
"Message": "Spare Guard Record core0",
"MessageArgs": [
"Spare",
"core0"
],
"MessageId": "OpenBMC.0.6.GuardRecord",
"Name": "Hardware Isolation Entry",
"Severity": "OK"
},
}
```
deepakala-k
force-pushed
the
fix_additional_uri
branch
from
55a74ac to
03e553c
Compare
baemyung
reviewed
Jan 24, 2025
| ? asyncResp->res | ||
| .jsonValue["Members"] | ||
| [entryJsonIdx - 1] | ||
| : asyncResp->res.jsonValue); |
There was a problem hiding this comment.
Isn't this already defined above L7125?
nlohmann::json& entryJson =
(entryJsonIdx > 0
? asyncResp->res.jsonValue["Members"][entryJsonIdx - 1]
: asyncResp->res.jsonValue);
If so, can L7243 be written as
entryJson["AdditionalDataURI"] =
boost::urls::format(
"/redfish/v1/Systems/system/LogServices/{}/Entries/{}/attachment",
logPath, entryID);
There was a problem hiding this comment.
But this is within the asyn dbus callback. So by the time, the dbus call is successful with the hidden property value, it could have moved out the function
There was a problem hiding this comment.
But this is within the asyn dbus callback. So by the time, the dbus call is successful with the hidden property value, it could have moved out the function
You're right. entryJson needs to be reset.
BTW, would this async callback be better to be a separate function?
baemyung
approved these changes
Jan 27, 2025
| ? asyncResp->res | ||
| .jsonValue["Members"] | ||
| [entryJsonIdx - 1] | ||
| : asyncResp->res.jsonValue); |
There was a problem hiding this comment.
But this is within the asyn dbus callback. So by the time, the dbus call is successful with the hidden property value, it could have moved out the function
You're right. entryJson needs to be reset.
BTW, would this async callback be better to be a separate function?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The guard records could be associated with hidden or visible PEL. The additional URI for visible pel would be
/redfish/v1/Systems/system/LogServices/EventLog/Entries//attachment and for the hidden ones it has be
/redfish/v1/Systems/system/LogServices/CELog/Entries//attachment
So before adding the AdditionalDataURI, check for the hidden property of the PEL and add the URI accordingly.
Tested and found it works as expected